*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b01d36dec1168f231aae48d32570ad0724e57bf3..f2a6ae5d662e6aeb4bb16dc4a2af19b3a9ae3696 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-31  Jason Rumney  <jasonr@gnu.org>
+
+       * files.el (magic-mode-alist): Use image-mode-maybe rather than
+       image-mode.
+
+       * image-mode.el (image-mode-maybe): Prevent magic-mode-alist from
+       interfering with attempt to set major mode from modified
+       auto-mode-alist.
+
 2007-01-31  Juanma Barranquero  <lekktu@gmail.com>
 
        * faces.el (color-values): Doc fix.